refactor(amazonq): separate edits from completion code path #7793
Conversation
|
⏳ I'm reviewing this pull request for security vulnerabilities and code quality issues. I'll provide an update when I'm done |
|
|
✅ I finished the code review, and didn't find any security or code quality issues. |
Will-ShaoHua
changed the title
|
|
||
| if (position.isAfter(editor.selection.active)) { | ||
| // Edit suggestion works differently than completion suggestion, so even when it's a deletion and cause cursor to move back, we still allow the request to go through | ||
| if (position.isAfter(editor.selection.active) && items.length > 0 && !items[0].isInlineEdit) { |
There was a problem hiding this comment.
if (is completion) {
if (cursor moved before trigger point)
}
| ) | ||
| ps.push(editPromise) | ||
|
|
||
| let result = await Promise.race(ps) |
There was a problem hiding this comment.
editPromise will likely always win the race because for most users the edit predictions are not enabled, hence its server API response will be very fast, and it will win the race.
| if (ps.length > 1 && result.items.length === 0) { | ||
| for (const p of ps) { | ||
| const r = await p | ||
| if (r.items.length > 0) { | ||
| result = r | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Ugly, but this is the best effort we can do atm
There was a problem hiding this comment.
We should add another field suggestionType within InlineCompletionListWithReferences so that we know which suggestion type it is instead of this hack. Can follow up.
|
|
||
| const result = await this.getRecommendationsWithTimeout(languageClient, request, token) | ||
| // Best effort estimate of deletion | ||
| const isTriggerByDeletion = documentEventListener.isLastEventDeletion(document.uri.fsPath) |
There was a problem hiding this comment.
@leigaol fyi, logic to handle trigger when users are deleting the code is moved here
4 participants
Problem
related aws/language-servers#2058
Edits as a newly introduced feature, previously the implementation was living in the same flow as Completion. However the 2 suggestion types have few different product requirements, thus we decided to completely separate these 2 suggestions out in terms of their code path.
Key difference
Solution
onEditCompletionlanguage server API which is purely for Edits suggestion.feature/xbranches will not be squash-merged at release time.